projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4dad967 0ae9a81)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:37:36 +0000 (13:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:37:36 +0000 (13:37 -0700)
commitfa9d9041aa05263b5331e32f99f7e3d5a1f16696
treec04ce068cefba3b22d9eeacdaf434d808cd92c6ftree | snapshot
parent4dad9675c58ea82f6d2f8ec8dfa10d67d754d1d1commit | diff
parent0ae9a816b9f68bd3f50fc287a342237c8b4fe78dcommit | diff
Merge from origin/emacs-25

0ae9a81 Document 'timerp'
2c72c46 Improve documentation of overlay priorities
f6fa160 Fix 'dired-compress-files'
2b8c5f0 Update commentary of STRING_CHAR and FETCH_MULTIBYTE_CHAR

# Conflicts:
# lisp/dired.el
# src/buffer.h
# src/character.h
doc/lispref/display.texi diff1 | diff2 | blob | history
doc/lispref/os.texi diff1 | diff2 | blob | history
lisp/dired-aux.el diff1 | diff2 | blob | history
src/buffer.h diff1 | diff2 | blob | history
src/character.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.